Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[modbus.lambda] Lambda Heat Pump #18248

Open
wants to merge 305 commits into
base: main
Choose a base branch
from
Open

[modbus.lambda] Lambda Heat Pump #18248

wants to merge 305 commits into from
+88,794 −53,597

Conversation

chilobo
Copy link

@chilobo chilobo commented Feb 10, 2025

Based on the Stiebel Eltron bundle by Paul Frank I contribute a bundle to manage Lambda Heat Pumps as a OSG addon to the Modbus Binding.

I did some testing by adding my jar to the local addon directory.
@agio tested it with two instances of heating circuits - thank you!
@lsiepel helped a lot by reviewing and suggesting changes which resulted in a #17595
@david-pace helped to point me to work with a separate branch - see #17846

See the README.md for restrictions on usage.

The binding is based on the Modbus description of the manufacturer:
(https://lambda-wp.at/wp-content/uploads/2024/11/Modbus-Protokoll-und-Beschreibung.pdf)
A few parts of the description are not implemented. If you feel you need them, just open a request.

Compressed directory:
org.openhab.binding.modbus.lambda.zip

@chilobo chilobo requested a review from a team as a code owner February 10, 2025 09:54
@chilobo chilobo mentioned this pull request Feb 10, 2025
Closed
jlaur added 28 commits February 10, 2025 10:58
@jlaur @chilobo
Simplify DateTimeType handling for Automower
b5f628a 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for AVM FRITZ!
c6f0e87 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for aWATTar
99bdb72 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for BigAssFan
60a18c3 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Bosch Indego
dce5e88 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Bosch Smart Home
a80f937 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Broadlink
b2ec2a6 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for DBQuery
998bf45 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for deCONZ
537f2c7 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Deutsche Bahn
a5dadb1 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Digiplex/EVO
5778d99 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Doorbird
b418556 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for DWD Pollenflug
31f37dd 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for DWD Unwetter
439f875 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Ecobee
f29be65 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Ecovacs
23d1df9 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Enphase
51d67d4 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for EVCC
5bac4a3 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Exec
515f73f 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Feed
2bdb17d 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Fine Offset Weather Station
d9cdab7 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Flume
f16e80b 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for FMI Weather
c296b9a 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Foobot
74dc4bc 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for FreeboxOS
1c35579 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Freecurrency
af6bd67 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Gardena
73bc36e 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@jlaur @chilobo
Simplify DateTimeType handling for Groupe PSA
3afda5c 
Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Christian Koch <[email protected]>
@chilobo
Copy link
Author

chilobo commented Feb 10, 2025 •
edited
Loading

Oops - I got a message that my commits were not signed off properly, so I followed the advice:

git rebase HEAD~16 --signoff
git push --force-with-lease origin modbus-lambda-binding

... which caused the addition of too many reviewers. I am sorry for that - what do I do now?

@david-pace
Copy link
Member

First of all, I noticed that you created a merge commit (Merge branch 'openhab:main' into main). As a general rule, this should be avoided (refer for this community thread for some background information) as it mostly messes up your git history.

As it looks currently this also happened to your git history. Your commits are not in a "chain" anymore but are completely mixed up with the other commits. The state you want to achieve looks like the following:

grafik
  • your local main and origin/main should be in sync and point to a fairly recent commit from the official openHAB repository
  • your commits should be a "chain" of commits on top of the main commit (could also be just 1 commit)
  • you should have a dedicated branch for your PR that points to the last commit in your chain

In your case the only solution I can think of is to start again:

  1. Backup your work. I think you are developing a new binding, so it should be fairly easy by just copying the whole binding folder you created to a safe place.
  2. Go to the github page of your fork and click sync fork -> update branch. The main branch of your fork should now be in sync with the official openhab addons branch. I don't know which options you have there since your main branch seems to be messed up, too. You basically want to throw away everything you did on your main branch and reset to the state of the original openhab:main branch. When in doubt, you can post a screenshot of what options you have there.
  3. Go back to your IDE and switch back to the main branch
  4. Pull the main branch
  5. In case your main branch is now not in sync with the commit shown in step 1, find the commit and perform a git reset --hard on that commit. Your main branch should now be in sync with the commit from step 1.
  6. Force-push your main branch. Now your main branch should be in a good state again.
  7. Now you can either switch to your modbus-lambda-binding branch and perform a git reset --hard on the latest main commit, or you can delete the branch and create it again starting from the latest main commit. The branches main and modbus-lambda-binding should now point to the very same commit.
  8. Switch to your modbus-lambda-binding branch
  9. Restore the binding backup from step 1
  10. Create a new commit containing all the changes for your binding (don't forget to sign it off)
  11. Force-push your modbus-lambda-binding branch
  12. Create a new pull request if possible

I hope this helps. If any of the others have a better idea, please let us know.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cedricboon cedricboon Awaiting requested review from cedricboon cedricboon is a code owner

@jlaur jlaur Awaiting requested review from jlaur jlaur is a code owner

@hmerk hmerk Awaiting requested review from hmerk hmerk is a code owner

@mherwege mherwege Awaiting requested review from mherwege mherwege is a code owner

@jannegpriv jannegpriv Awaiting requested review from jannegpriv jannegpriv is a code owner

@lolodomo lolodomo Awaiting requested review from lolodomo lolodomo is a code owner

@maniac103 maniac103 Awaiting requested review from maniac103 maniac103 is a code owner

@sibbi77 sibbi77 Awaiting requested review from sibbi77 sibbi77 is a code owner

@mhilbush mhilbush Awaiting requested review from mhilbush mhilbush is a code owner

@alexf2015 alexf2015 Awaiting requested review from alexf2015 alexf2015 is a code owner

@limdul79 limdul79 Awaiting requested review from limdul79 limdul79 is a code owner

@DerOetzi DerOetzi Awaiting requested review from DerOetzi DerOetzi is a code owner

@Hilbrand Hilbrand Awaiting requested review from Hilbrand Hilbrand is a code owner

@RSStephens RSStephens Awaiting requested review from RSStephens RSStephens is a code owner

@andrew-schofield andrew-schofield Awaiting requested review from andrew-schofield andrew-schofield is a code owner

@Friesoch Friesoch Awaiting requested review from Friesoch Friesoch is a code owner

@MikeJMajor MikeJMajor Awaiting requested review from MikeJMajor MikeJMajor is a code owner

@rmichalak rmichalak Awaiting requested review from rmichalak rmichalak is a code owner

@soenkekueper soenkekueper Awaiting requested review from soenkekueper soenkekueper is a code owner

@jwveldhuis jwveldhuis Awaiting requested review from jwveldhuis jwveldhuis is a code owner

@J-N-K J-N-K Awaiting requested review from J-N-K J-N-K is a code owner

@lujop lujop Awaiting requested review from lujop lujop is a code owner

@pravussum pravussum Awaiting requested review from pravussum pravussum is a code owner

@rs22 rs22 Awaiting requested review from rs22 rs22 is a code owner

@caffineehacker caffineehacker Awaiting requested review from caffineehacker caffineehacker is a code owner

@boehan boehan Awaiting requested review from boehan boehan is a code owner

@BobRak BobRak Awaiting requested review from BobRak BobRak is a code owner

@kaikreuzer kaikreuzer Awaiting requested review from kaikreuzer kaikreuzer is a code owner

@jpharvey jpharvey Awaiting requested review from jpharvey jpharvey is a code owner

@gedejong gedejong Awaiting requested review from gedejong gedejong is a code owner

@MrRonfo MrRonfo Awaiting requested review from MrRonfo MrRonfo is a code owner

@hypetsch hypetsch Awaiting requested review from hypetsch hypetsch is a code owner

@AntonJansen AntonJansen Awaiting requested review from AntonJansen AntonJansen is a code owner

@marvkis marvkis Awaiting requested review from marvkis marvkis is a code owner

@tratho tratho Awaiting requested review from tratho tratho is a code owner

@david-pace david-pace Awaiting requested review from david-pace david-pace is a code owner

@GerdZanker GerdZanker Awaiting requested review from GerdZanker GerdZanker is a code owner

@jofleck jofleck Awaiting requested review from jofleck jofleck is a code owner

@ccutrer ccutrer Awaiting requested review from ccutrer ccutrer is a code owner

@ssalonen ssalonen Awaiting requested review from ssalonen ssalonen is a code owner

@cpmeister cpmeister Awaiting requested review from cpmeister cpmeister is a code owner

@andrewfg andrewfg Awaiting requested review from andrewfg andrewfg is a code owner

@tisoft tisoft Awaiting requested review from tisoft tisoft is a code owner

@pfink pfink Awaiting requested review from pfink pfink is a code owner

@blafois blafois Awaiting requested review from blafois blafois is a code owner

@cdjackson cdjackson Awaiting requested review from cdjackson cdjackson is a code owner

@paulianttila paulianttila Awaiting requested review from paulianttila paulianttila is a code owner

@mlobstein mlobstein Awaiting requested review from mlobstein mlobstein is a code owner

@Wolfgang1966 Wolfgang1966 Awaiting requested review from Wolfgang1966 Wolfgang1966 is a code owner

@cweitkamp cweitkamp Awaiting requested review from cweitkamp cweitkamp is a code owner

@digitaldan digitaldan Awaiting requested review from digitaldan digitaldan is a code owner

@paphko paphko Awaiting requested review from paphko paphko is a code owner

@morph166955 morph166955 Awaiting requested review from morph166955 morph166955 is a code owner

@GiviMAD GiviMAD Awaiting requested review from GiviMAD GiviMAD is a code owner

@psmedley psmedley Awaiting requested review from psmedley psmedley is a code owner

@mgeramb mgeramb Awaiting requested review from mgeramb mgeramb is a code owner

@dominicdesu dominicdesu Awaiting requested review from dominicdesu dominicdesu is a code owner

@bobadair bobadair Awaiting requested review from bobadair bobadair is a code owner

@billfor billfor Awaiting requested review from billfor billfor is a code owner

@3cky 3cky Awaiting requested review from 3cky 3cky is a code owner

@aurelio1 aurelio1 Awaiting requested review from aurelio1 aurelio1 is a code owner

@fwolter fwolter Awaiting requested review from fwolter fwolter is a code owner

@HolgerHees HolgerHees Awaiting requested review from HolgerHees HolgerHees is a code owner

@wborn wborn Awaiting requested review from wborn wborn is a code owner

@florian-h05 florian-h05 Awaiting requested review from florian-h05 florian-h05 is a code owner

@jimtng jimtng Awaiting requested review from jimtng jimtng is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.